resolution of conflict